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

Change-Id: Ic5421e74ba1e5219cd66cab7d047c5c7fd3f94d3