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

Change-Id: I97527ac09e37b46a9fed184dd67ef79a7d2b4309