Import translations. DO NOT MERGE
am: 54e5382136  -s ours

Change-Id: Ie55ae75412f7a8e89763679c2e179d1bae2c7619