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

Change-Id: Iaf098f037a43689b6608903dc3efb25504215105