Merge "Snap for 5180536 from c103b546d2e33aacd8187a6bf54b28efa325ffbe to pi-platform-release am: 98cdb732ce" into pie-gsi