Import translations. DO NOT MERGE am: 2645dade1f  -s ours am: 0c5800e18d  -s ours
am: 0bfa43aa48  -s ours

Change-Id: Ia462053df73d1b9aaa39a81d5ab695dbb6f3aea7