Merge "Snap for 5061196 from ea96f70b7698694119e18826bfb2aa7b40f92dc6 to master-cuttlefish-testing-release" into master-cuttlefish-testing-release