[automerger skipped] Import translations. DO NOT MERGE
am: 08ea0d1fc3  -s ours

Change-Id: I65d5cd3fd2e1587ce75cf50d1e81bd3ef8d14b7a