Import translations. DO NOT MERGE
am: 16891d4831  -s ours

Change-Id: I72f17bcb1778280a32801795e8f345626e697854