Merge "Merge "Merge "Small refactoring of field/method access checks." am: 209b4c7141" into stage-aosp-master am: 5c8cc7c671 am: 9dd1c52d49" into oc-dr1-dev-plus-aosp