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

Change-Id: I9e7e796031c959c0c027e9d4226231b03b5907f4