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