Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev