Merge "Add ClassAccessor" am: 438918b2f3
am: ebe8719f3e

Change-Id: I5a3e70e973ec484e0415a2a049d43dd0e4340e70