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

Change-Id: I2791e40e60ec455cff9d35670fcec6f6c62f2b08