Snap for 4787078 from af153e0a5d081c7ac8045a73a48498b619c97abf to pi-release

Change-Id: I05c3502b9a76bf50f6c2be1356b9451878e222e3