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

Change-Id: I8479a739292c62568c0f06c8d7153eb690fcc7b0