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

Change-Id: Id2dc541ef35ca1fb55bf8d36952e2b155ed3a76c