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

Change-Id: I3740ace4f45e8d6ab7ccbfdc5cc1994cc2ad73dc