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

Change-Id: I20b11f322076af59e52501e79c47bc01635c79b8