Import translations. DO NOT MERGE am: eb9166bc21  -s ours
am: 10251a3340  -s ours

Change-Id: Ia6d220970885a41e9a1dcd51f5729f732792bc40