Import translations. DO NOT MERGE
am: 4b85c844c8  -s ours

Change-Id: Idfec398c4f391865f8ec93984a213c09e43dd1ed