Snap for 4756844 from d47fd3791387eded068f6554c0dfdaa0ee5ceef2 to pi-release

Change-Id: I8e39405ae9aa0b7c3f8dd207f1209b93cb6456d7