Import translations. DO NOT MERGE
am: 0d9cd777a4  -s ours

Change-Id: I0e41a9bbbc8bc1cc618dffe2fd14714fc70490eb