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

Change-Id: Id08fdcae21e3ceb54e893a9ed11da6e67c889895