Snap for 4706961 from a9c46ad45e0c781c658ddf34fcb06a634be50b2a to pi-release

Change-Id: I9f31bfbf39a27c78a63473c5a6405f55eda0ad67