Merge "Improve seeking for Xing header without TOC" am: cd17b7453d
am: 28301383d3

Change-Id: Ic2be37ece7c93a5633b28ec3e73e0d8796c9ac7b