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

Change-Id: Ifa55266b3c0b3201e465a9ed81949c149154dff2