Import translations. DO NOT MERGE am: ee19efbc68  -s ours
am: d0d3db824e  -s ours

Change-Id: I0f7b47a2a8d370e477aa0590fc9777eeb7b4d23d