Merge "Move cursor to end of text when autofilling." into oc-mr1-dev
am: de499f469f

Change-Id: Ic1ededd2eb3ba4827d8efcd170a3f20ffb9f6aa3