Snap for 4807121 from 1a5092e9648b9e59b7e2d7fd92b9368cd5966af9 to pi-release

Change-Id: Iddde659f4a4b6bd5f2fa6ca44d954360f589a10c