Merge "Snap for 5622519 from 5061ce55a5ce222cf722eab8c5abe986b8415128 to pi-platform-release am: 2592e2bef7" into pie-cuttlefish-testing