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

Change-Id: Iedcde15869e0c41d67c5549caefcf97cba7f4e73