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

Change-Id: I8d9acd18dbe3448a55e7d2236cf65eae679d0672