Snap for 4413317 from 0d09b2e61da9e0c8f2c3d8de4963b69d82a00e2e to pi-release

Change-Id: Ia7c50d9a4b9402f2b3cc709145e1c827bc41765a