Import translations. DO NOT MERGE am: 5910ddb8f3  -s ours
am: fcf7377d29  -s ours

Change-Id: I6d9ad2e14b19ba590c1598d8ff228e9f34a825ec