[automerger skipped] Import translations. DO NOT MERGE
am: 760ff60aca -s ours
am skip reason: subject contains skip directive

Change-Id: I7f57589cbb85ffc517021f5a9cc4bdd80ffbfec6