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

Change-Id: I868e18e9f1ad0c43c8d30f40b7b7efb8d5798581