Merge "Snap for 5600800 from 8fbd57f3208b224fb7bf6e5d0525907c6cb0a7b9 to pi-platform-release am: d6a067466c" into pie-cuttlefish-testing