Import translations. DO NOT MERGE am: c3bf78b1ea  -s ours
am: 1304f3b36a  -s ours

Change-Id: I409cb6c5439790c481ed07927010b5b112418905