am 7cd90e73: am 98ae4201: Merge "Fix braino in ArtCode refactoring."

* commit '7cd90e73eae48df4060ac405a69df007dfaadc01':
  Fix braino in ArtCode refactoring.