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

Change-Id: I4a38ab6ef3ea8061735a930232542f5d4e5e838d