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

Change-Id: Ie41ed82249c2c5296d1bb030e37518bcbf1bcb5b