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

Change-Id: I36ee254358c8b85d8523af2b3875e31f3c8b571f