Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev am: 8f5c9de9 am: 62ffcb36 Change-Id: I80dbc3cb1eed565a3f5aea1bbc89b31bc4a03b4e