[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8aff1adbe0 -s ours am: b253520351 -s ours am: 7ca45dcc82 -s ours am: d4da8c017a -s ours

am skip reason: subject contains skip directive

Change-Id: I77dd694bc6832401b388f2d2e1f4dc6e3eb2e416