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

Change-Id: I8426e9fa50cee441ee145271c49baa02fca68488