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

Change-Id: I4c895c05f13ab4f4768c5859567bffb106d91c01