am 52a154fe: Merge "Remove"

* commit '52a154febb7c06b142116235c368417dd5e542ba':
  Remove