[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8aff1adbe0 -s ours

am skip reason: subject contains skip directive

Change-Id: I119719b9bda586c72df735dfc7e390e018bbaaba