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

Change-Id: I85df93d0cbc1dd87e724711ff2b14d145c2ae15e