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

Change-Id: I40123d5a1ab28d7905d883a108f39ef0aafd5a1b