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

Change-Id: If75d5012b1d2a3d8a9d7928d885b92f73f783c2e