am 59e574d0: Merge "Remove obsolete TODOs and obsolete code" into jb-ub-mail-ur8

# Via Android (Google) Code Review (1) and Vikram Aggarwal (1)
* commit '59e574d0d3e823fdda91db34b269a1dd1b86dcc3':
  Remove obsolete TODOs and obsolete code