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

Change-Id: I101a2a3ca47a294e47de429b0c62c7f3a3da2c70