Merge "Add CommonArtTest"
am: d637fdac0e

Change-Id: Iac01571279e80cb9182237da63efc24ea6994614