am c07ba7a7: am 7299cf9f: Merge "Remove"

* commit 'c07ba7a7d4e3eaa6b825ef4b98e19caa2f2977ae':
  Remove