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

Change-Id: Idaf2f036566669baa1500525d3beae2efdacd531