Merge "Retire cb_handle_30_t::physAddr"