Merge "Snap for 5622519 from 206dc44bf5b4303b80dc8dd2060166bbfaa2acdf to pi-platform-release am: 357ea98e57" into pie-gsi