Import translations. DO NOT MERGE
am: 504f612225  -s ours

Change-Id: I415a3a9f3ef5c0e801e397fdc521212fbafe647d