Import translations. DO NOT MERGE am: 98d4aea6e1  -s ours
am: a524308cde  -s ours

Change-Id: I6f16d8aecae7d9cb356cae82fec65f149f3a4cfd