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

Change-Id: Icc27ada729da1c1f79d6f08f7371b77d805b17c5