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

Change-Id: Id16641c0709137a916dc8f52316c869a411af238