Import translations. DO NOT MERGE
am: b64355fe05  -s ours

Change-Id: I8d9e79f46a0b99f98839da875450c0912d094cc6