[automerger skipped] Import translations. DO NOT MERGE
am: 8c56825ecd  -s ours

Change-Id: I3a9cfd19929f45a1d551c2e09d5b7e67103a89aa