Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
am: 0cc1ce6f29

Change-Id: Ib5b5ee32dcb37c30ddc4720fe904826af69cb944