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

Change-Id: I303355233bfbbbe45a83666ffbd3f0dfaa580254