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

Change-Id: I9d7aaa757f21343d5ae6cfec4fb2783113fa597b