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

Change-Id: I4236968c86ce38cd70a92f687f711394b61f8846