Merge "Remove api_dir property"