Snap for 4773106 from 7e31e22f572cf8a32ebe0d392b1ea4415c02e9fe to pi-release

Change-Id: Ie2a30992c945baf4dc844858c2a793e9c2243a8b