Merge "String character limit and description updates" into ub-contactsdialer-h-dev
am: 426cf57e88

Change-Id: Ib287be2571a764177b85624ecb9928620de378a2