Snap for 5622519 from 0a318a6dfd1b6a644c638916edffa17a8221362f to pi-platform-release

Change-Id: I712cbd4afbbe38b62e41673b150afa0da6afccc3