Snap for 4388640 from e6619b7ba561609f0e0ad7fb7a6d7fc6eca6ca91 to pi-release

Change-Id: Id6e171dd2dc91f01d6516bc5fe160f66e982c01f