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

Change-Id: I1c56d1cfddccd02a8f5a54169b9cfa0797bfb741