Snap for 4693621 from 1e74d335d83280b1bc385e6e7004c33281a4ca0d to pi-release

Change-Id: Ib6e881898b612a3c533e50d6d16c713b34fd83b0