Increase char limits on some strings am: 882dcfb5a8
am: 81ea60a877

Change-Id: Id9d58e8469cab04ff75c7da9fcf183bead29d55d