Import translations. DO NOT MERGE am: dccfc04a3e  -s ours
am: ae35fa061e  -s ours

Change-Id: Iefe3d69297ef0f4cb04ede83b2b93b523678c3ff