Merge "Merge "Move non-access methods to checkOp" into rvc-dev am: 9999e8f08c am: 5ff7f22574 am: 57ae40e766" into rvc-qpr-dev-plus-aosp