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

Change-Id: If94c356c3a814c800285057bff95dac0ebe3e13b