Import translations. DO NOT MERGE am: c3c1e0a983  -s ours
am: ef4923a584  -s ours

Change-Id: I960f3d496869053a41ac3f86733aadf666ff6310