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

Change-Id: Iee33301222f501bffd89c5e3e03490ca405b71ea