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

Change-Id: Ice9a2019083177a8a9807537c2ebb1ece0803ae2