Snap for 5450365 from 6e7aa3f49da37f23c10087276a12984cdbd9d125 to pi-platform-release

Change-Id: I7a58e0bd37852c7ca15b462520e76b20eb961f38