Snap for 5240760 from 44fa3522bcbb58afc173341b239b56d3b39d0867 to pi-platform-release
am: bbe89f4115

Change-Id: I2782e7240cab85d68ea4a2161617598af909efe2