[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 73f2ecbcd6 -s ours am: 4eaac7f546 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibebb2e37d26e9670102e0983f8937fed3e5b378f