Snap for 4545621 from 0ea1a80f4cb65f8d94acc990e809c00fc27e66f2 to pi-release

Change-Id: I9641e46b309c2ef5ff50c20e66265b6489c14cfc