Snap for 4751833 from 7a4bca245128a407ab5d958bf6f352d8f45181e3 to pi-release

Change-Id: I6f21b4eeb12f042dff4293ce92a061ed766c861c