Snap for 4380820 from b6ec71333f4b82e5460a806066139e91e7cbe08b to pi-release

Change-Id: Ide71107ecea087575b0598c76f895fc7d21bc5d9