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

Change-Id: I871201065b4e6d412bdda0ae71056b07d34c2b22