Import translations. DO NOT MERGE am: dbb0502d2f  -s ours
am: f870ef3edc  -s ours

Change-Id: Ifda9eca142b398cdb4dc77b92a6f8f1046dd322b