[automerger skipped] Import translations. DO NOT MERGE
am: 2bab47d9dd  -s ours

Change-Id: I642b5af7f20b65a784b6f0732b03ce7ad8bbd4cc