Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release Change-Id: Id6da3d2a6060ab955d3ff85ae0062a40dcfd5692