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

Change-Id: Id457f8ffb590a29a59cebf1613ca9a21a9d0bb7d