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