Merge "Merge "Merge "Small refactoring of field/method access checks." am: 209b4c71" into stage-aosp-master am: 5c8cc7c6" into oc-dev-plus-aosp