Merge "Move to using ClassAccessor"
am: fe891a88a9

Change-Id: I0762a7368b163e3cc54dc55cdb4d60bb2ae29138