am d9e0cdfd: am 69f7c472: Merge "Remove obsolete comments"

* commit 'd9e0cdfda9988f2f45ded4c2c590b8f61c4d9335':
  Remove obsolete comments