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