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