Snap for 4641295 from df29be4d63c4187a7eb35b8f473ad9fad1fc439a to pi-release

Change-Id: I2e3f02b09fafe4c01f9624cc05f32530d47354e4