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