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

Change-Id: I63c8024c3bf392e292c5d5df5787fdc9066584f7