Snap for 4821244 from bed0aff4a21d89f0b6b2bb2351aa6e63e9f60170 to pi-release

Change-Id: I99b6ac5df600ded3e48e026f2be8f75735017ae3