Import translations. DO NOT MERGE
am: 780931dd46  -s ours

Change-Id: I704c75e6c47dfbca42026953ff92de50612cec1e