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

Change-Id: I7754e276d3ba6fe65b806e7513224122e8e63ab9