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

Change-Id: I2a2f16f7ac0e74e3dd03ee4a81299d46050e99fb