Import translations. DO NOT MERGE am: 50e19c566e  -s ours
am: e708378dc9  -s ours

Change-Id: Ifdce36eb6dbb6c0af7a1f65d9142e77b05a2f5da