am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev automerge: 59e96ee4 * commit '58d66c30': Fix NPE in Transport.applyBatch