Import translations. DO NOT MERGE
am: 958f398e31  -s ours

* commit '958f398e3169d4e649f5ac1fa4069fe17b7086fa':
  Import translations. DO NOT MERGE

Change-Id: I8c724de7a11a104b1a039e54a378e1501cf030cb