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