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

Change-Id: Ia3ac308068119abd6a12849182c599f5584800b2