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

Change-Id: I9386dcafaf6ab05766df03ecbaaf9cc8b01f69e0