Merge "Stop using AlgNameMapper"
am: 8646736618

* commit '86467366183e7b7ca006456474cca50332213ca5':
  Stop using AlgNameMapper