Snap for 4706961 from 91f3db08341f676957276a71ce6d98cbd5c7c9bf to pi-release

Change-Id: I9fb6d09b24a7baa88785fdc58b3ef4748fcc8818