Snap for 4751833 from a599c6c553aee86dd5a15db3e71d6d4cee7a5fd4 to pi-release

Change-Id: I4569e60985de773d586bed9b671af8f93931b07b