Merge "Move profile testing to CommonArtTest" am: 5bb62fcb2e
am: dd1bbd2420

Change-Id: I9775c32c1784e9936a1701106aa2a72ebd855b38