Import translations. DO NOT MERGE am: 20ecef5595  -s ours
am: 96bbbc3dce  -s ours

Change-Id: I633ed6f22295af6e3bb76cf68d6f7ba8558024f1