Import translations. DO NOT MERGE am: e9d8092bfd  -s ours
am: 85e2566ea2  -s ours

Change-Id: Ib0ca5c4267ceb3d9db9b5911f31f70bc3e127283