Snap for 4686875 from 7aaf70796d2f6c74ca599385624050d7186731f6 to pi-release
am: cbc44f0225

Change-Id: I0048004897d0ca20ac8e1478e06036e66e2963a0