CDAP-538: Removed TODO; Replaced service startup check to private method.