Import translations. DO NOT MERGE
am: 42ba47e66a  -s ours

Change-Id: I9e87182158f3fcf45eb3e4ca1ef68476581bdac4