Merge "Snap for 5622519 from 055bce8a2b7ca79bc82b922d5147b5bad5983866 to pi-platform-release am: 7324b69df9" into pie-cuttlefish-testing