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

Change-Id: I473328778fb37b71367d0ae27afe0657f95716bf