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

Change-Id: Ia1fabd7576c0a0730c344ab546d087c4c6d2a4d6