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

Change-Id: I1036dddd138385bda19dc13c06d99287b9262653