Snap for 4496165 from b46f419f6b4cb3f2e70af3fcadef6634f80ac454 to pi-release

Change-Id: I4699781c45bf8d736fb4f2cc30f7c7f778eaa386