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

Change-Id: I5b5c35a903e9a99b1ea23b194aaa33b32c80786b