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

Change-Id: I9c35ee348a2df6048481577e2597911cc35b6ea5