Snap for 5622519 from 2a42b4ab0996679109253b49482d45bb55dcbe44 to pi-platform-release

Change-Id: Ief227346b1a16c493e3fe751578285215216b631