Import translations. DO NOT MERGE
am: 8eff1c381b  -s ours

Change-Id: Ifea203c04a0312a552568b842e464252e3506cb7