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

Change-Id: I7d46fe0493dbfc2262fb1bfc50b5d190d704c404