Snap for 4571561 from 00a7b21c7b2af9b19a0b6173e0de92197d537fec to pi-release

Change-Id: I14f2bf2dee0c39f2429eba0bb42ed5a968005c8f