Merge "Snap for 5622519 from 60d48c6ad0a7998ee46880e5b6aaa6a52d971886 to pi-platform-release am: 5c30b7e864" into pie-gsi