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

Change-Id: I3659911be17b3fb80997beca139ec4999a07a28e