Snap for 4605948 from d2c9edd9c883dce2031be118737a09bd04b25908 to pi-release

Change-Id: I3f8e9e65e14441af4e7f5f0d0149bb1c9485235f