[automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours
am: 89f71578fc -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3a283cbe6ce6304774bb5b69481bd209f704e6a