Snap for 4807121 from f32b53eab70ea1775ea0ec25337fe28544e5e025 to pi-release

Change-Id: I6c7358c554955df2438af7d4b82a93ee3e3ae348