Snap for 4462748 from c611158092b477bcf1ed40b136ba5e3cf253dc95 to pi-release

Change-Id: Icb1989ff5bc3489dbe3645c64742cb73ac19712b