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

Change-Id: I9874a21cbd9dec3325748cf1f57337e0c812c4a4