Import translations. DO NOT MERGE am: 961b18d42f  -s ours
am: 3c9c7ca337  -s ours

Change-Id: Id50ff04e0234fd19fdcb534a5c52cdc61e3ed8e1