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

Change-Id: Ibbb2d0e7d7e587af96929bffc4c8c04f34263a5c