Snap for 4818534 from 36f6f66a0e62f9bd5a667b65553f922efd5c3b7e to pi-release

Change-Id: If907bbe1ac5fa01733edbdf0d059c25d31f6d8db