Merge "Small refactoring of field/method access checks."
am: 209b4c7141

Change-Id: I3dca13f9272785e9feced30ae0e809156bf68509