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

Change-Id: I99cc9649f4e3af117faaf70e30de650653de4316