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

Change-Id: Ic02b76baa6a29bb08c41cc2bef9be9e2a94e8bae