am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev

* commit '7c5fdf3251a44fb584c957de37849e4d4b6d363e':
  Add ICU jar to SDK