[automerger skipped] Import translations. DO NOT MERGE
am: 45397b4ae7  -s ours

Change-Id: I7354377995e1a0f696a56d0ee9c1b95b6dabcfd9