Import translations. DO NOT MERGE
am: 717de1098c  -s ours

Change-Id: I8e5456283e0ee66b768aeb664b876b2aceb8ff0b