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

Change-Id: I43254f2368f3e7bf8eb82a9b9b9ee04f6e2a86fe