Merge "Increase length of string for pref title" into oc-dr1-dev
am: 34373c8f33

Change-Id: I4a3d05aade72fc2de50a8fc6df574d8073bdafd6