Merge "Snap for 5622519 from be4f7fab087f24a9ac2203279f8506ce6746be1e to pi-platform-release am: 2ba10b3757" into pie-gsi