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

Change-Id: Icf59d14a80691160f93239e29d9c0dac1e8e50f2