Merge "Increase the character limit for "Use System Selection" message" am: a7ce460921 am: d0386d8c07 am: 798e1862bd
am: 6fe88fa07b

Change-Id: I3c6e6b3078d122b4b188669adea8ac86005a7eb8