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

Change-Id: I0e0c522bc7dd2c6ac74bc2ae6e6b2269c01282ba