Merge branch 'addr_translation_tests' into sockfs