Snap for 4459973 from ee204a7eb6d914da12561942ae7fc5da7d2e0132 to pi-release

Change-Id: Iffd53b42cea50b364e503dd25eec5c2c412d5200