Snap for 4611397 from 0d4a75abf06b2d196b2f6cc7f558798d5a8e6bf7 to pi-release

Change-Id: Iaf6d6b24c3434cd64c910a0b74568c882b8a2d8c