Import translations. DO NOT MERGE am: bdd42af760  -s ours am: b135979b24  -s ours
am: c7e4e7965d  -s ours

Change-Id: I4eb45992feab9efa703f7f6476cbbe5d92a01eb8