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

Change-Id: I52bd0ba6cee2435648f1ccf8a53bc9d76526973a