[automerger skipped] Import translations. DO NOT MERGE
am: 46a694cd21  -s ours

Change-Id: I0fa1961b2ad8d07fa42d57f8a3d8687af7b00cca