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

Change-Id: Ib77eeb0ef00aa3573d37c227ffa713249c4fbbad