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

Change-Id: Iff89271315880c168fb26e3f4387f0d84eb9b154