Import translations. DO NOT MERGE am: 836e990  -s ours
am: 1fce744  -s ours

* commit '1fce7442addaa4873537638e4995e1f426520835':
  Import translations. DO NOT MERGE

Change-Id: I972e303c5baa82968e28fc6f44167900f344d718