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

Change-Id: Ibdbedcf8ab0f1785a718c2e5b773b6b7af05239e