Import translations. DO NOT MERGE
am: 3de7ee4463  -s ours

Change-Id: I9222199d59a75e5a190139e134a5cff74727f9f3