Snap for 5450365 from 4da019026f05f85431a748acdc46799728cf0047 to pi-platform-release

Change-Id: Ice77976af6d00a18cbc56f7682d2f91431ebb5b2