Import translations. DO NOT MERGE am: 27628b01c6  -s ours
am: 2a7d40c7ce  -s ours

Change-Id: I0a32502d3f010bb7bf55f4f66dbaa9db0b6e15a7