Import translations. DO NOT MERGE am: 46bf87f2b7  -s ours
am: 83ccd60392  -s ours

Change-Id: I6319e68059ede59de445ba69e10516d62fe21593