Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev am: 4a86fbc4d9
am: 251cd37b78

Change-Id: I1006878a32a0be2608fb29667b401e4be64e1a6b