Merge "Push existing pending state when deferring transaction" into pi-dev am: 70522fe55c
am: 6e267a4b28

Change-Id: I19ed3e1300b0176a842fd1e57057d1b63b087d91