Merge "Remove KeyMint TODOs"