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

Change-Id: I894c39579460c43a641676528c6e1eb254f20448