Import translations. DO NOT MERGE am: bb14cb49ea  -s ours
am: cbd7ee698a  -s ours

Change-Id: I1e33252f50b014c6832d86e4c5b33f3ad5e45ed1