Merge "Snap for 5622519 from 81b3f635622cda59f93cc13edf0621da064bc072 to pi-platform-release am: 617c38c8cf" into pie-cuttlefish-testing