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

* commit '2c3e0af13c08379895f0ec296f2e5cb7670acb4a':
  Add ICU jar to SDK