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

Change-Id: Ibc7b786d52d497a34977c721c7a5fc6b43874319