Snap for 4539010 from 4a61b06994d03a31215409d45188a8b3628d292c to pi-release

Change-Id: Icea5df226d2c730f2f0bdae7fc8266558385980a