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

Change-Id: I7b757cb1cc4622b05a2b1b2e277f680eb7e19898