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

Change-Id: I63e6c602f7bf6eca7ea34fe27115cf704c4d56b5