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