am 7edf7c81: Merge "Clean up Add/Remove space."

* commit '7edf7c81724ecdc59847436ef451881b7ba54261':
  Clean up Add/Remove space.