Import translations. DO NOT MERGE
am: 761f04e26a  -s ours

Change-Id: Icf34e79fe4957dfba2419465d497006074d36b0c