Merge "Merge "Move non-access methods to checkOp" into rvc-dev am: 9999e8f0 am: 5ff7f225 am: 57ae40e7" into rvc-qpr-dev-plus-aosp