Merge "Snap for 5180536 from 64f95592f3bc922952396445d7dbc7acebdefd96 to pi-platform-release am: 075e446d18" into pie-cuttlefish-testing