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

Change-Id: I9d217702012e6067adf95b221470bc788230e38b