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