Import translations. DO NOT MERGE am: c74eab1d53  -s ours
am: 8b6d69bcbc  -s ours

Change-Id: I75d3af9db6f8ec118952b52bdfc985a94fc35e30