Merge "Remove obsolete hack for TI specific code" into jb-mr1-dev