Snap for 4824048 from e963fdec5867b4274ad7359c7d74a4d15a4fd9d5 to pi-release

Change-Id: I60b7195a7ee10ae50b582ae0d46a42d470872c40