Merge "Snap for 5622519 from fd365ae91ebe924197c5f443c889928eb07bd02c to pi-platform-release am: ec58694ae8" into pie-cuttlefish-testing