Import translations. DO NOT MERGE
am: a937ff573e  -s ours

Change-Id: I714848e4322a4e2ffb6cabc4f99509ab8536c7bd