Snap for 5622519 from c242c4a5462c845ee9e3e4e913505626553ff77b to pi-platform-release

Change-Id: Ia85f587586f17ae84648eb470a7f92a63080db20