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

Change-Id: I85431a65bac9408c7a2499d449db6aedb6043f1d