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

Change-Id: Ie231b43463e651c8785dacab5dd59624e10caac2