Snap for 5622519 from be4f7fab087f24a9ac2203279f8506ce6746be1e to pi-platform-release

Change-Id: Iddebb0a809f22fee8b039d04b5f552cb220426bb