Import translations. DO NOT MERGE
am: ef67a7e8d8  -s ours

Change-Id: Ic4fd8c10bcd5dc9a37078222921900848ec8d411