Merge "Do not call art-on macro by default." into lmp-dev