Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev