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

Change-Id: I543f5e0c6944f66d07716511d41127f6c9af344a