am 7299cf9f: Merge "Remove"

* commit '7299cf9fcacfe96eacd15584efb065c32be4ffee':
  Remove