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

Change-Id: Ifcf0616b6e42a1a478dfaa7551c4ba8038396b24