Import translations. DO NOT MERGE
am: aa29f638f6  -s ours

* commit 'aa29f638f68d5c08d4043a28e1f1dfcdb08e2c1d':
  Import translations. DO NOT MERGE

Change-Id: Id6cb93b1b2bf02e33cfe13a999e7f7afc6b6da56