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

Change-Id: I8a56c18219ef5aa8cc308cda9c5148cac6c8c8a8