Snap for 4410151 from ff7c618fd31bb3a1e3bb92bdd250938d6839006d to pi-release

Change-Id: I8a8533aaa1253f4cc0bdc4b3bd93fef0673db5ef