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

Change-Id: I2ce2b5d82188a84d7d67ff8e1763dc7eb5f2d032