Import translations. DO NOT MERGE am: c1c5f46464  -s ours
am: b0157ad485  -s ours

Change-Id: I4923f50754be1c81c5aa1f36a3d2ce26a7fe6157