Import translations. DO NOT MERGE
am: 17a13e32a4  -s ours

Change-Id: I307c6791850330aa267eb69a7b22f669898c6e3a