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

Change-Id: I0ca3c6f12cd2e869bfc56153f7d1bb3ee760dcf3