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

Change-Id: I055e172b0576fb8231e4feb62953f60e8a9fa755