Import translations. DO NOT MERGE
am: 2183a3519e  -s ours

Change-Id: I44ffb363d046e8e691c0c0cfde2b9ca8590c7d56