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

Change-Id: If3ff263d4f628f2c6d4ad3c28d0571284ca1f56d