am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev

* commit '12b5e504fd3845fed9c649cf01cd27b84fb6742c':
  Fix NPE in Transport.applyBatch