Merge "Snap for 5450365 from 9cae09cda97305ed0f613385e4d569ac9246cd51 to pi-platform-release am: 1306201879" into pie-cuttlefish-testing