Merge "Code BidiFormatter code" into jb-mr2-dev