Snap for 4402171 from 71c6d11e1fef4a52db0563ebca05dbd006467855 to pi-release

Change-Id: Icb93bb1d6f1a7473baf34049b931bc9f5d88194f