Snap for 4577102 from f50ebc09a8c9c820b9f0c1ac25a972c75c732a21 to pi-release

Change-Id: Ida93df35229b710ecda3b6ea6d2bcdfa6049f768