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