Import translations. DO NOT MERGE am: de5eefa935  -s ours am: 9d008286c7  -s ours
am: b4e9b3f651  -s ours

Change-Id: I8b727efb19b68f7adfc1f3eda4240e70551b8102