Import translations. DO NOT MERGE
am: a8c2b1a431  -s ours

Change-Id: I93831c414c6069144d04d36495cee14e51303726