Import translations. DO NOT MERGE am: 41c8c2a57b  -s ours
am: f07d4052af  -s ours

Change-Id: I10e3cf1cdaa7866ddeed17caefef5ad3860c3ab0