Snap for 5622519 from 5061ce55a5ce222cf722eab8c5abe986b8415128 to pi-platform-release

Change-Id: I3bb48d15b690e4cc359dd4402777efd2a2c6bc81