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

Change-Id: Ic7aeaa7603ce96dc69a3fd016261b15847db71a4