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