[automerger skipped] Merge "Import translations. DO NOT MERGE" am: a3e3e0c07f -s ours am: 0121c648be -s ours am: 00307ca85c -s ours
am skip reason: subject contains skip directive

Change-Id: I018850f51d865568f9cdd266d5a13bed28be66d6