Import translations. DO NOT MERGE
am: 20ecef5595  -s ours

Change-Id: I24aa5633f96710fb343ad9f9d880ab18749d262d