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

Change-Id: I69c918e38b9edee41b80dd01c9786981f1f890c5