Merge "Snap for 5674421 from fa4a379ff8e06a8d0d9a9c9e57c3b3cdb6027db1 to pi-platform-release am: a22302ec9a" into pie-cuttlefish-testing