Import translations. DO NOT MERGE am: ac7dd9a101  -s ours
am: f2b0d92241  -s ours

Change-Id: I4a8ea0d9be149b361a6f7fa98980e50d4b2a3112