Snap for 4807121 from be9b6f807197ae63c4e347f6d0bf4427ecacc205 to pi-release

Change-Id: I8b531ad1814c9ee8b2443fedb92cd5911fda356f