Remove obsolete TODO and improve codeCoverageIgnore usage

Change-Id: I6b8c986c416c361320822708b567ab28d22b2d45
Merge "Remove obsolete TODO and improve codeCoverageIgnore usage"