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

Change-Id: Ie714d84ea2adfe77d7dda03952b850fce12303c0