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