Import translations. DO NOT MERGE am: c00e04f148  -s ours
am: 794c8ce7b7  -s ours

Change-Id: I317120531318e122bbecaef6263cf58c885b5441