Snap for 4653471 from 210d3211fe074a86459ca5cf5270de0e8c23b482 to pi-release

Change-Id: Ia15d4f564e64078ead52adbd23499734849a93fe