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

am skip reason: subject contains skip directive

Change-Id: I46c4106b8158aecf93b9a1a36b170409f510d534