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

Change-Id: I171c9c28f68e3f26e173dca9dc3fe0bb1bd68c95