Snap for 4605948 from a809513fb8e78750edf9154d8ca8d3870d247913 to pi-release

Change-Id: I512b9099bc2a2abc3bb7d957c2917436871278af