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

Change-Id: Id93b604b4cbe547deef8f1d5e809253ba658fa50