Merge "Add CommonArtTest" am: d637fdac0e
am: d7abfb13b5

Change-Id: Iaedb5f7f1d771def3532807ecfb0afde71f20b54