[automerger skipped] Import translations. DO NOT MERGE am: 592414829f -s ours
am skip reason: subject contains skip directive

Change-Id: I925b904c0eda3edb2cc2e5c07f65097a373bad5f