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

Change-Id: I0777ff28aa01814239b3d53fd4c34f7742459788