Import changes : ability to add traits
Reviewer: Dan Jao
Issue: GCP-8879