Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2  -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7 am: 22fc1c9d7a am: 111f8b0c9f am: d25ae05764
am: 39498fbccf

* commit '39498fbccf0e5f48c47dbaf31ba3f10af8c56c07':