Import translations. DO NOT MERGE am: ca2ead63c9  -s ours
am: 2192d06b21  -s ours

Change-Id: I5d6efc9f948b01823d854393bb4e319866aaa458