Snap for 4611397 from da9a84e43e1710b4512825ef31bffd9d6b61df59 to pi-release

Change-Id: Ia91c3b1a400b802bb13ec12676bced099c4c79cc