Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: Ic5ebca15896c2e2ade4012248567e6415178007b