Import translations. DO NOT MERGE
am: 2f525fbdc5  -s ours

Change-Id: Ie4d8ae83b68daefb3f38ee59fa961f8c127e3227