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

Change-Id: I968d7228ca3c58a2c075e129b8198d26204aff98