Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2  -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b
am: 7e9cef30e7

* commit '7e9cef30e7b3d5aef740fcb77e89e47c3a7be975':