Import translations. DO NOT MERGE am: a4e479afec  -s ours
am: a76f80c519  -s ours

Change-Id: I912507f92155593edbf06af0612ac91a89f67b69