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

Change-Id: Ie4960279d9f49f19fab4948a29812a375619ea14