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

Change-Id: I1f3d91a8dd8071a88d35a01965141cc8c01657a9