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

Change-Id: I36f228a6128f6ddedd209554682243cb2949e6f3