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

Change-Id: If1e9f7aa7c92f5bacdcebea3c7a6be61ea53ba8a