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

Change-Id: Idc97f7644ef2f4de1e916a72e3b1c97b3dc62a86