[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 5f2cebc10a -s ours am: ec24f7597f -s ours am: 11dae26476 -s ours

am skip reason: subject contains skip directive

Change-Id: Icdecc59726e3b1cd5d33cffd7315525fc8bad13e