Increase char limits on some strings
am: 882dcfb5a8

Change-Id: Ie2967db2e99fa87e836e9038b0e4e8c2e68cc7e4