Fix NPE in deferToPendingTransaction. am: c24078f1a2 am: 885452fe7c
am: 409484440c

Change-Id: Ia7494ade982bcc0eec871cea6c0cd8b930602283