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

Change-Id: I41112276bcb2290ba39fa5917618ca2b21c4a0ea