am adbafa1a: Merge "Support ICS on the user dictionary settings"

* commit 'adbafa1a9b5adfa21884cc8fc7e73d61ab08d3c8':
  Support ICS on the user dictionary settings