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

Change-Id: I7888cece47eda22cfa006afbf667207e629a7cae