Import translations. DO NOT MERGE
am: 4f0e401700  -s ours

Change-Id: I78d7025352a10d338bec46082bcfae2f7e1a29e3