Snap for 4787078 from 7ac4a30be5d8cbfafc740f9f86d30f37d15f4483 to pi-release

Change-Id: I023220312020004dac956d100acc7f901cebd97c