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

Change-Id: I120adda515fd4891b6b9b68e93cef5555951bacc