am 8755359a: Merge "Enable moving classes."

* commit '8755359a35a4aa915fe3753633015263c7e97b74':
  Enable moving classes.