Snap for 4517567 from eaaac98f7bd1ba08dfcb7e54a38e146a8e89a23d to pi-release

Change-Id: I4e9e6f81fbcdf0c12fde8fa9ac3fae0e1ccfd7a5