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