Import translations. DO NOT MERGE
am: 28753c7c4a  -s ours

Change-Id: Ie2d08b1e339982bc8606ff4ecf58487604220bfe