Import translations. DO NOT MERGE
am: 08838a1c53  -s ours

* commit '08838a1c531f8b6a1017ea6a4a736af2f2e30ef6':
  Import translations. DO NOT MERGE

Change-Id: I6fac7f2f87869174b3bc5f0bf96cd9347dec6270