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

Change-Id: Ib543768946e7401314efbcdeba0fd0ee8df31583