Merge "Remove unused APIs and variables in SubMgr."