Snap for 4410151 from fd9e0626d4f71d738e3dae6e2d2683f6ea15f075 to pi-release

Change-Id: I8ab747ef96e6f20cb998af1ab2d6f7b71dff7b78