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