am 69f7c472: Merge "Remove obsolete comments"

* commit '69f7c472f660f2fe4c2e44e0a7446c8bf819fcd5':
  Remove obsolete comments