Import translations. DO NOT MERGE am: 4eab71c931  -s ours
am: 6ed391b1c8  -s ours

Change-Id: I37e2952a4047fffb274272331ec3881bba3fc6da