Import translations. DO NOT MERGE
am: 13431e75dc  -s ours

Change-Id: I63efefbacd2c759efffd252dcf4ec4a5b7848542