fix last open TODOs within AndroidPayment