[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 74937235a5 -s ours am: 1a129bc680 -s ours
am: fb26ea4356 -s ours
am skip reason: subject contains skip directive

Change-Id: I1aea72a9fa35018bc1985ced3288d4dcf8de8e8a