Import translations. DO NOT MERGE am: e29fe3e37e  -s ours am: 569795ab19  -s ours
am: 2f741b2243  -s ours

Change-Id: I13016a86e05376f5830aa6fe9ca42e0fcd9fb9d6