am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit '9bbc490e17d38a9734a2b95a308100a7d0ec6dcd':
  Fix timedtext parsing