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

Change-Id: I384de897a6bdea684096d88a226bffabf0d54a28