Merge "Default number badging off." into oc-dev
am: 076a255a76

Change-Id: I6c6b6f7107467009608f5695b4a374f1bdc4959b