Merge "Snap for 5622519 from e7055ee4f72fe027cfb970330fecdc672e8ee83d to pi-platform-release am: 7192f738a2" into pie-cuttlefish-testing