Follow gerrit's move of Attribute classes to data package Change-Id: I565abbb94f6d8ee30343402e6f1e767c38bbd3f8