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

Change-Id: If44a3a9e9da85fe19b5ccbfd0755b3855d64aa14