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

Change-Id: I572f3469627b8c9e842e32bd05245cf00ba4b512