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

Change-Id: Id907dec92e7cd33035e0695010b8bbc016cc375a