Import translations. DO NOT MERGE
am: 4cdc225ade  -s ours

Change-Id: I122a4d78fe065fc5290ed5f03f3d1675c53abac2