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

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