Snap for 4731145 from a1a25ff30e8e9f46d4da72bac672469352c839bb to pi-release

Change-Id: Ibedea4f14f101680441fb6a17779d96dc48bad9e