Merge "Fix NPE when combining pop with add transaction." into nyc-support-25.2-dev am: 09616c0c1d
am: 5f6eef1051

Change-Id: I430bce6c672a1d069e365fd1d7c80dd83b1cddec