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

Change-Id: I090e55f0f34ff556118caaecbb21169580c66ab6