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

Change-Id: I880f291397b8fa3c42029eee00ef4881a9ce7193