Import translations. DO NOT MERGE am: 1155e53  -s ours
am: 856309e  -s ours

* commit '856309ebf44883b090fe8da0ca65df8f03a5b2ac':
  Import translations. DO NOT MERGE

Change-Id: Id116d78e7f303b88b85fbdcb5cac2bea14a2b0ea