Snap for 4818534 from 66b55782b895daffb609785695c47523bbb22f9a to pi-release

Change-Id: I3dcee3b3386d9b39bd1b000f679d55bf39223252