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

Change-Id: Ibafbc25e1d704d7e84a168b32d35a165dd41e06f