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

Change-Id: I3c0b882716a005ceb4a189fb38a1b9e447932fc3