am 070bac6e: am c4658407: am 7351ad8d: am 8b37abda: am 75b75d8b: am 5fdea477: Merge "Always record word boundaries"
* commit '070bac6eb21667b338d4e51dab80eaf2a9bf3ad8':main
commit
d1fb89b83f
* commit '070bac6eb21667b338d4e51dab80eaf2a9bf3ad8':main