am 67e32ffc: am d8aada95: (-s ours) Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev

* commit '67e32ffc9df546aef75a340cbeb8b7b8a3c19dd4':
  DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend