Import translations. DO NOT MERGE am: a860e80b92  -s ours am: 9cc0e28204  -s ours
am: 4ebeaf09fd  -s ours

Change-Id: I1d6a5a7cacc3d8d8b769c51025a72ca7a06b3cff