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

Change-Id: Id6dd1dcd78c675cc6225e6059e49661449632642