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

Change-Id: I3b48ebbf47a13343006d561ebe17cf22eda0b705