am bf1c8135: Merge "Fix use-art-*."

* commit 'bf1c813532db9c61537b08c14b4a2c22d9dadea0':
  Fix use-art-*.