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

Change-Id: If2afc42abb0ff79707a8360a83d0e3aaeeb0396a