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

Change-Id: I547ff74c38450d0ca96cf4102a5ef0ef5397e27a