Import translations. DO NOT MERGE
am: 95cd3f1976  -s ours

Change-Id: I1e881c254423133430aae108a87d349d49ba07d6