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

Change-Id: Ie7b3d425aad4dcd1edd54f45ecd37551c573e64f