am d884c63c: Merge "Use ICU for relative time formatting"

* commit 'd884c63c100ecc9e96fa55de5110f7034ba9cc03':
  Use ICU for relative time formatting