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

Change-Id: I583cb0317d68517b77068832c1248d323c4667f3