Snap for 4410151 from 4dd4aadcb08ac66389e1db808c95589aeb34a975 to pi-release

Change-Id: I7d73e258f47f8bc529743932bb5ffd4dfae93fbc