Add os_version and os_features to Image Upstream-commit: fc9912fd00f5e12a6f0904f3c758275724ba3318 Component: engine