Merge "Use ICU ImmutableIndex" into jb-mr2-dev