Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release Change-Id: Ia211f36b5f279e12d5a4aaad592c3f1c1d3f2599