Snap for 4393550 from e1fa89c56893352381e6c59b38a3412b087c3f91 to pi-release

Change-Id: I6c3a62e59107552f9ba234600817717a2ce1b2e0