Import translations. DO NOT MERGE
am: 30f7712ec1  -s ours

Change-Id: I98804c7aa989ca111074dbe2b915dc41d6183e21