Snap for 4473011 from 9e14957efdf0461e3c11fc2f4c7d4aefb2baaa50 to pi-release

Change-Id: I8d7f4ad0bc7f1e1c6b5dd2dad7cb035f5f9a1ff9