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

Change-Id: I377bd47d50022c58aa5a83ddca6c93c9afff5fe0