Snap for 4731145 from c5e409aa6b5083b6a7a431ac920455ca41ed0db7 to pi-release

Change-Id: I09401a44b7a606c29c4262d30bdf6a4a1f703a71