Begin indexing unexpanded text forms

Bug: 60487
Change-Id: Iea1ab7b645e26cbdaa8d73bf2d82563628b9e230