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

Change-Id: Ifd3e9cce1f8a4f2d0df5e7ee160846acfca6708c