Merge "Removed TODO introduced in ag/4344061"