[automerger skipped] Import translations. DO NOT MERGE am: 2ff803e2a3  -s ours
am: e5852a2943  -s ours

Change-Id: I71091ffdd4cedac8779beaa684c1c992d1e57f2c