Merge "Remove SDK dep from module_lib_api"