Snap for 4739962 from f16521df400a914eaf245c4f8119b39dd10d5e7c to pi-release

Change-Id: Idea7d32447f6e32dd9620dbf66375f77a130e431