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