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

Change-Id: I35c9ec1c2bad8b826ced7c3939f270676fc71a04