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

Change-Id: Ied454e7cc014a2675a66155a8e0cf45191af1e4f