Snap for 4407698 from 64c0c34879e9cca933133734e8a99a68e428805f to pi-release

Change-Id: Ib1d60859fe6b5a0105e46a4ebd9887c4a24e63b6