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

Change-Id: I9a604d57b9f7c1152da74306e59022182f825d70