Import translations. DO NOT MERGE am: c30efc0214  -s ours
am: a40b64efdd  -s ours

Change-Id: I22920b6cf6235adc4e478c14f86cd12d8e918d61