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

Change-Id: Ib418d21810b2cae69eeda5a38ab70cd55fd90225