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

Change-Id: Ide5a50298517db7a6a1ec2da742a2a1566ce6f1c