Snap for 4571561 from ae1d1fa8a667e746ae9836c774cb54b9e68dfa2c to pi-release

Change-Id: Iace0a15a488adb215ba7bccf51f4a0785409f761