Snap for 5310204 from ac302f92f4cfe7e110ea9c5e948af1869a781792 to pi-platform-release

Change-Id: Ifdfdcc7e42b0e32881fba54ca83991008030cbd1