Merge "Move to using ClassAccessor" am: fe891a88a9
am: 759d185990

Change-Id: I715041de8d68ca25b2a006583849f7a8d2efb348