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

Change-Id: I5bcce2e15265af9c85e766fd62beb3b65c13d809