Import translations. DO NOT MERGE
am: 1834716f17  -s ours

Change-Id: I294bb43be00d0a603f183c09e05f58c6903fd946