Snap for 4509671 from 869834d4b4d14cae93ea548cd88517b65df469ce to pi-release

Change-Id: Idc02f5bee4e8194ee1e799f98588af0f2992b95e