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

Change-Id: If8006d175415a20c5f6748fdac1e0b9b30b12642