Merge "Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release am: e101e8712e" into pie-gsi