Import translations. DO NOT MERGE am: 079f2c6e13  -s ours
am: 1cc7738bfe  -s ours

Change-Id: Ie6d4cb68ac50c63e5224cbae57da3ae0aff8b6bb