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

Change-Id: I930a54f0a1d7bc8fa3e9566d6d8246897e5ebd88