Merge "Add ClassAccessor"
am: 438918b2f3

Change-Id: I571032c22b19057587a40447b47ea7ac40138251