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

Change-Id: I1591a59754abf48a6d53ae990f578dcfa055e14d