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

Change-Id: Ic9f65be968a41b3419a655102838a432f8d3b62d