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

Change-Id: Iaf5db663c04ea11d9fe142cadc850a2b8a83869b