Import translations. DO NOT MERGE am: 566e26e26e  -s ours am: 6f0e8580e6  -s ours
am: 40620c6443  -s ours

Change-Id: Ib1a754ec7c7e51d3192a28b2f3e699a9256b4fc9