Prevent art module types being used outside art am: 0c89d57305
am: c96d48cb13

Change-Id: Iad4ffbc3a22736fe0727e90b9a4bfbbb6c845860