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

Change-Id: I5c5fdf0583705cc07c096d34a46152a5b07d67ed