Merge "Remove reuse of pending deferred transactions." into nyc-mr1-dev
am: 1b6e3e4824

Change-Id: I0debd85195ff11c8509600135f288a07cfc34f82