Import translations. DO NOT MERGE am: 8e3bb06f6b  -s ours
am: c0c8f3b8ea  -s ours

Change-Id: Icaf424ecdc2944c0b6cc3f2dca055c5957b062cd