Merge "Rename ANR -> Anr to conform to code style" into rvc-dev