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

Change-Id: I35ae1e4c7a2e6e1f5e6e6075c77ab7c65533c297