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

Change-Id: I0e777523597d91407f23f1f5c1ae8f84dd27c051