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

Change-Id: Ib4e310cd8dd58202d9847fbeca00454d5b705bc5