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

Change-Id: Ic192d76bf26a37373d18944f459bcacae754c174