Merge "Rename ANR -> Anr to conform to code style" into rvc-dev am: 61ac9f9478 am: e931b25181

Change-Id: Ic5133550a7ff4229efedc797d24c38782ee8cfcf