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

Change-Id: I5abd0bac9c356750be03de0189d5e398b6c52621