Snap for 4765531 from 6e411bbab0c85cd7817ca066c2d405dc45ee29f2 to pi-release

Change-Id: Iac30a1772f9d79d027b40dc31768b02931dc3579