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

Change-Id: Ic3ec9431550da3bcdc9b8b10fde604b19dec069b