Merge "Increase the character limit for "Use System Selection" message" am:...
Merge "Increase the character limit for "Use System Selection" message" am: a7ce4609 am: d0386d8c am: 798e1862
am: 6fe88fa0
Change-Id: I3c6e6b3078d122b4b188669adea8ac86005a7eb8