Fix for long titles
Also update the README
Bug: T149054
Change-Id: If6301cee13feb7160902dc47d1627ea3c83e0bea