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

Change-Id: I02738fafa779fa0067bedd9a1dba82115bae6630